From b30f9b1bbf30a4a19b60e9d20064349f5f73e285 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sat, 27 Jan 2024 13:25:02 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 552149 -> 552868 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index d9ce2736834..fdf4ea863c3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -926,7 +926,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	odk_settings \
 	odk_settings_generated \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index 90c1caa91f221aef5ab87b4387399e4745fd6fa9..f3904c5ba0198f4b58843daa1407ecac7d1895bb 100644
GIT binary patch
delta 613
zcmZuu&ubGw7-cr!ZZ=CAur+OoQD;+8BUP#eZ-JyKh&d<{wV=ch?FLt4QrPImll2s^
zDuIAca<CT<1$$^gjhjV1Nc|5y6l`k_JqeyYsgoa81qU9?_vXEM-+c3FU4Oo%&%b2(
zN<iacUA~dKlbbDF%hb=U1+m4M-*21c>qq-EepoEz{aq~B>=31d0Zp5Y?a*zTg?qGA
zVN)2ZG99-}Hn=00w%Nh`-MGy7crUgSlI`CcyK7jP>P&?RNCKYbOoe>$T}Cl?wP0jR
zvo|ALkMUv&i48h}_)l3yydcZCms4cydqq*KI5ZeG3YMYy%sej}R+&c*{GEYzQreBV
z$4tfM8=A!W6D5GR&nSSXL!)S1kq1!ws1VLLq=T=L3d^BAXndzI+!J06%MOL`^*#-u
zwj>&;JtY}m)`+m}2#&v(hM~0RIF`0)s6H3;WAg=zVq(EVh(GkG*mz9?m~YVp_#;uS
zv`DWv(j(wZCVUpo`iIF;e0wLU*y~aZ$CgD8Lgl@5I(;fNeKr}3h&e^N<LmrfXXQ=J
z$9vEA@!LhqDDza}VnT=oFAn>fuA;O5SCTjJz@^a0pNaL&y+E{wDX9O)r6rQt^o6PP
V`NJK3b<rgOSwLwny55tkzW`C>%(?&o

delta 255
zcmZ2-U-9Zq#fB}6X%+44Rg6H)1jNkS*{fK7*-y9H#-cKvpNWlQx<d{#*Yy3{STv`X
z?_v?39>d4PG5z2!7USuj+gT*03+x6G_1js5rrYgik(s_=DGST=q}?pi)9)-`5t)9*
zl$~?>A`sU*fr)Rr!%8O3={JGg$p^ytrgQCKF`Pc_H>2R>1VNGM1$$Wdrw6=Y<e1*S
zhs73R(2YGTveRusIJl<^>;<Y7OJ)+7p17CAme0#E%+bZ)*)!PP3rJ1Z{mm{V3l-Dk
fa&(Rl4s{9+(Lhqwp0|$$h*^P{ZF}B6cC(ED+Sph<

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0095619d50..eeb4afa2a51 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 8b8ee8ccaac..073f048998f 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 8c1728671d9..405d84a72db 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -181,7 +181,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2